do-not-abort-on-NON_APPLICATION_FONT_USE

Gbp-Pq: Name do-not-abort-on-NON_APPLICATION_FONT_USE.diff

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index e08242f692bec48bdb6d337b4f56cfdf9cee0fe8..9ecea6ecd11b2fad067196f33d32dc944ebc7b91 100644 (file)
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -143,9 +143,6 @@ else
                $(if $(gb_CppunitTest__vcl_no_svp), \
                        $(filter-out SAL_USE_VCLPLUGIN=svp,$(gb_TEST_ENV_VARS)),$(gb_TEST_ENV_VARS)) \
                $(EXTRA_ENV_VARS) \
-               $(if $(filter allow,$(NON_APPLICATION_FONT_USE)),, \
-                       $(if $(filter abort,$(NON_APPLICATION_FONT_USE)),SAL_NON_APPLICATION_FONT_USE=abort, \
-                       $(if $(filter deny,$(NON_APPLICATION_FONT_USE)),SAL_NON_APPLICATION_FONT_USE=deny))) \
                $(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
                $(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
                $(if $(strip $(PYTHON_URE)),\